label: No need to special case single-line mode
authorBenjamin Otte <otte@redhat.com>
Mon, 18 Apr 2011 02:25:53 +0000 (04:25 +0200)
committerBenjamin Otte <otte@redhat.com>
Tue, 19 Apr 2011 20:18:18 +0000 (22:18 +0200)
It's already taken care of by the layout.

gtk/gtklabel.c

index 0ef1f7f2e57df4bbcaf49c1e79447f5e137ca4ee..3f837459115d0c7fd7accd7679ab899ccb727eac 100644 (file)
@@ -3559,7 +3559,7 @@ gtk_label_get_preferred_layout_size (GtkLabel *label,
   pango_layout_get_extents (layout, NULL, natural);
   natural->x = natural->y = 0;
 
-  if (priv->single_line_mode || priv->wrap)
+  if (priv->wrap)
     natural->height = get_single_line_height (GTK_WIDGET (label), layout);
 
   if (priv->ellipsize || priv->wrap)